From ded45867815a3afa811a326f3baa5bf04ef98157 Mon Sep 17 00:00:00 2001 From: Jakub Steiner Date: Wed, 5 Feb 2020 17:30:42 +0100 Subject: [PATCH] theme: revert app grid button styling - the plan was to drop the frequent/all view switcher, thus sam didn't pay too much attention to the button styling for those. Sadly the view switcher remains, so we should keep the old subtle styling intact. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/979 --- .../gnome-shell-sass/widgets/_app-grid.scss | 39 ++++++++----------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/data/theme/gnome-shell-sass/widgets/_app-grid.scss b/data/theme/gnome-shell-sass/widgets/_app-grid.scss index 416b176e2..e8736dd6c 100644 --- a/data/theme/gnome-shell-sass/widgets/_app-grid.scss +++ b/data/theme/gnome-shell-sass/widgets/_app-grid.scss @@ -202,41 +202,36 @@ $app_grid_fg_color: #fff; } // buttons -.app-view-control { - padding: $base_padding $base_padding*5; - margin: 0; - background-color: transparentize($osd_bg_color, 0.5); - border-width: 1px; - color: darken($osd_fg_color, 25%); +.app-view-control { - &:hover { - background-color: transparentize($osd_bg_color, 0.5) !important; - box-shadow:none !important; + padding: 4px 32px; + margin: 0 4px; + &, &:hover, &:checked { + @include button(undecorated); color: darken($osd_fg_color, 25%); + background-color: transparent !important; + } + + &:hover { + color: $osd_fg_color; + box-shadow: inset 0 -2px darken($osd_fg_color, 25%); } &:active { - box-shadow: none; - background-color: $selected_bg_color !important; - &:hover { - background-color: lighten($selected_bg_color, 11%) !important; - } + box-shadow: inset 0 -2px $osd_fg_color; } &:checked { - background-color: $selected_bg_color !important; - color: $selected_fg_color; - box-shadow: none; - &:active { background-color: darken($selected_bg_color, 4%) !important; } - &:hover { background-color: lighten($selected_bg_color, 7%) !important; } + color: $osd_fg_color; + box-shadow: inset 0 -2px $selected_bg_color; } &:first-child { - border-right-width: 0 !important; - border-radius: $base_border_radius 0 0 $base_border_radius; + border-right-width: 0; + border-radius: 0; } &:last-child { - border-radius: 0 $base_border_radius $base_border_radius 0; + border-radius: 0; } } -- 2.39.5